Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 30 Jun 2011 17:47:53 +0000 (10:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 30 Jun 2011 17:47:53 +0000 (10:47 -0700)
commit9fd4ae38d23c4021d3517919bbc4b4afbdf169c8
tree32a9098d6072e7ab7f544367b918251bc454150b
parent63fa0cb4c1f67ed5564fa6f79286ccd16ae1721c
parent0941524b833ec78aa65cd989b3387b7ef3c45a31
Merge from trunk.